From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 08:12:45 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c84d5d936dbda2084b2c08364c8c0d5e514fc1b6;p=emacs.git

merge from trunk
---

c84d5d936dbda2084b2c08364c8c0d5e514fc1b6